From 4ab671f382a15877cccc8545b270edbf655c5720 Mon Sep 17 00:00:00 2001 From: "emellor@ewan" Date: Tue, 4 Oct 2005 11:43:38 +0100 Subject: [PATCH] Catch xen.xend.XendProtocol.XendError as well as xen.xend.XendError.XendError. This horror needs cleaning up -- this is just a stopgap. Signed-off-by: Ewan Mellor --- tools/python/xen/xm/main.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tools/python/xen/xm/main.py b/tools/python/xen/xm/main.py index 10b70f1470..b7fa555eb2 100644 --- a/tools/python/xen/xm/main.py +++ b/tools/python/xen/xm/main.py @@ -32,6 +32,7 @@ import warnings warnings.filterwarnings('ignore', category=FutureWarning) import xen.xend.XendError +import xen.xend.XendProtocol from xen.xend import PrettyPrint from xen.xend import sxp @@ -710,6 +711,14 @@ def main(argv=sys.argv): print print "Please report to xen-devel@lists.xensource.com" raise + except xen.xend.XendProtocol.XendError, ex: + if len(args) > 0: + handle_xend_error(argv[1], args[0], ex) + else: + print "Unexpected error:", sys.exc_info()[0] + print + print "Please report to xen-devel@lists.xensource.com" + raise except SystemExit: sys.exit(1) except: -- 2.30.2